userMenu: Ignore 'lock-enabled' setting for user switching

The preference controls whether the screen should be locked when
the screensaver is activated, not whether the screen should be
locked at all. In particular after having switched to a different
user, log out should not automatically switch back to the unlocked
session, so always activate the lock when user switching.

https://bugzilla.gnome.org/show_bug.cgi?id=685536

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index cfa105ae8e78a705828f743604c50ddd379b9382..6eb445f97d226fa19e29dd24085a914d5da95e31 100644 (file)
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -824,8 +824,7 @@ const UserMenuButton = new Lang.Class({
     _onLoginScreenActivate: function() {
         this.menu.close(BoxPointer.PopupAnimation.NONE);
         Main.overview.hide();
-        if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY))
-            Main.screenShield.lock(false);
+        Main.screenShield.lock(false);
         Gdm.goto_login_session_sync(null);
     },